Auto merge of #1189 - alexcrichton:issue-1185, r=huonw
authorbors <bors@rust-lang.org>
Mon, 19 Jan 2015 02:53:02 +0000 (02:53 +0000)
committerbors <bors@rust-lang.org>
Mon, 19 Jan 2015 02:53:02 +0000 (02:53 +0000)
Closes #1185


Trivial merge